Fix CK struct packing for Windows builds - #209
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR addresses a Windows ABI mismatch in the exported PKCS#11 struct layouts (notably CK_FUNCTION_LIST) by enforcing 1-byte packing on Windows, preventing misaligned function pointer offsets returned by C_GetFunctionList. It also ensures the generated wolfpkcs11/options.h header is installed when using CMake so consumers can compile against the installed headers.
Changes:
- Add Windows-only
#pragma pack(push, 1)/#pragma pack(pop)around PKCS#11 struct definitions inwolfpkcs11/pkcs11.h(with an opt-out macro). - Install the generated
options.hvia CMake so<wolfpkcs11/options.h>is available to downstream builds.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
wolfpkcs11/pkcs11.h |
Applies Windows-specific 1-byte struct packing to match expected PKCS#11 ABI for CK_* structs/function lists. |
CMakeLists.txt |
Installs the generated wolfpkcs11/options.h header so installed includes are complete for consumers. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Member
|
CI failure fixed in #210 |
dgarske
approved these changes
Aug 7, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves #208.